From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 25 Jun 2009 12:06:44 +0000 (+0100)
Subject: VT-d: remove debug prints and turn on qinval read/write drains
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13689
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=44b9decf714a33e9ce749e3e1865479d57d1f76c;p=xen.git

VT-d: remove debug prints and turn on qinval read/write drains

This cleanup patch removes debug prints and turn on read and write
drains for VT-d queue invalidation if HW supports them.

Signed-off-by: Allen Kay <allen.m.kay@intel.com>
---

diff --git a/xen/arch/x86/x86_64/mmconfig_64.c b/xen/arch/x86/x86_64/mmconfig_64.c
index 81b72f6402..01b24a378b 100644
--- a/xen/arch/x86/x86_64/mmconfig_64.c
+++ b/xen/arch/x86/x86_64/mmconfig_64.c
@@ -114,25 +114,15 @@ static void __iomem * __init mcfg_ioremap(struct acpi_mcfg_allocation *cfg)
     unsigned long mfn;
     unsigned long size, nr_mfn;
 
-    printk("amk_mcfg_ioremap: PCI_MCFG_VIRT_START %lx\n", (u64)PCI_MCFG_VIRT_START); 
-    printk("amk_mcfg_ioremap: start_bus %x end_bus %x\n",
-               cfg->start_bus_number, cfg->end_bus_number);
-
     virt = PCI_MCFG_VIRT_START + (cfg->pci_segment * (1 << 22)) +
                (cfg->start_bus_number * (1 << 20));
     mfn = cfg->address >> PAGE_SHIFT;
         size = (cfg->end_bus_number - cfg->start_bus_number) << 20;
         nr_mfn = size >> PAGE_SHIFT;
 
-    printk("amk_mcfg_ioremap: virt %lx mfn = %lx size %lx\n", virt, mfn, size);
-
     map_pages_to_xen(virt, mfn, nr_mfn, PAGE_HYPERVISOR_NOCACHE);
     addr = (void __iomem *) virt;
 
-    printk("amk_mcfg_ioremap: PCI_MCFG_VIRT_START %lx\n",
-        (u64)PCI_MCFG_VIRT_START); 
-    printk("amk_mcfg_ioremap: virt  %lx size %lx\n", virt, size);
-
     return addr;
 }
 
diff --git a/xen/drivers/passthrough/vtd/qinval.c b/xen/drivers/passthrough/vtd/qinval.c
index c543aa1a69..de22f28700 100644
--- a/xen/drivers/passthrough/vtd/qinval.c
+++ b/xen/drivers/passthrough/vtd/qinval.c
@@ -120,8 +120,8 @@ static int gen_iotlb_inv_dsc(struct iommu *iommu, int index,
     qinval_entry = &qinval_entries[index];
     qinval_entry->q.iotlb_inv_dsc.lo.type = TYPE_INVAL_IOTLB;
     qinval_entry->q.iotlb_inv_dsc.lo.granu = granu;
-    qinval_entry->q.iotlb_inv_dsc.lo.dr = 0;
-    qinval_entry->q.iotlb_inv_dsc.lo.dw = 0;
+    qinval_entry->q.iotlb_inv_dsc.lo.dr = dr;
+    qinval_entry->q.iotlb_inv_dsc.lo.dw = dw;
     qinval_entry->q.iotlb_inv_dsc.lo.res_1 = 0;
     qinval_entry->q.iotlb_inv_dsc.lo.did = did;
     qinval_entry->q.iotlb_inv_dsc.lo.res_2 = 0;